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