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