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