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