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