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