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