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