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