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