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