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