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