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