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