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