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