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