[automerger skipped] Merge changes from topic "auto_data_switch_api" am:...

[automerger skipped] Merge changes from topic "auto_data_switch_api" am: 5b326816 -s ours am: b489a7a8 -s ours

am skip reason: Merged-In Id827b3e253b637273504d87c8db64893c7b70924 with SHA-1 ffc4b56c is already in history

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



Change-Id: I9e3a851dca29e497d0264a5b9acc34453bae406d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>