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