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