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