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