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