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