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