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