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