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