Merge "Revert "Fix, add, and enable app consent, blocked tipics, privac..."" into tm-mainline-prod am: db065071e0 am: 9fbba7fe8c

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

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