Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23680143 Change-Id: I2b65e858794346e3231bb7fdb0a013a2d4934677 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>