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