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