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