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