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