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