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