Merge "Refactor consent manager, clean up the simple set/get function" into udc-mainline-prod