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