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