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