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