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