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