[automerger skipped] Merge "Fix privacy controls redirection" into...

[automerger skipped] Merge "Fix privacy controls redirection" into udc-mainline-prod am: 1a6c1fd1 -s ours

am skip reason: Merged-In Idf37d83b2572eab863f2c2c09ddddeb5cc619008 with SHA-1 337fe28f is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Permission/+/24855045



Change-Id: I9bd7e57080ae83831828967dbcefc805876911fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>