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