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