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