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