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