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