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