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