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