Merge changes from topic "am-2879e0be5fd94b46a936a8b86ad29c09" into udc-qpr-dev-plus-aosp

* changes:
  Merge changes from topics "cherrypicker-L13300000963667898:N27000001416235071", "cherrypicker-L85800000963667755:N59500001416232655" into main am: e9c999d7 am: 4e6ab071
  [automerger skipped] Fix implementation reference am: 7841d10c am: ea76db73 -s ours
  [automerger skipped] Enable EnforcePermission linters for test sources am: df85978e am: 53b0749a -s ours