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