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