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