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