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