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