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