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