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