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