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