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