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