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