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