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