[automerger skipped] Merge "Supported UNKNOWN in IWLAN handover rule" am: 1a90569c95 am: 5a1166355a am: bf5f0779fa -s ours
am skip reason: Merged-In I68c23f970af2a554ab438f630363be4591664cbb with SHA-1 d9ac485b1f is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2195237
Change-Id: I120b24c956f8c345406d174444785356055f3a59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: