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