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