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