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