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