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