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