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