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