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