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