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