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