[automerger skipped] Merge "Notify CellLocation whenever ACTION_USER_SWITCHED" am: 2a5efce2d7 am: 4a73b5f3b5 am: cbbe436700 -s ours

am skip reason: skip tag Change-Id I6761c4bb500da1748119f9917663dae0307ab437 with SHA-1 2b7b9fdc25 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1550658

Change-Id: I0b6037ca0697c67ab35ab4378741f21c83fe32dd