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