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