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