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