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