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