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