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