Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21673464



Change-Id: I45ffde90d1b91b709b6e00622a789722c7cd750f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>