Merge changes from topic "am-0c32d01cd08f4eacbc6cee4d05aad6f8" into udc-qpr-dev-plus-aosp

* changes:
  Merge "[automerger skipped] Merge "Ensure policy has no absurdly long strings" into sc-dev am: 34ac6bbd -s ours am: d8c3a883 -s ours am: ab871aa9 -s ours am: 9d5807a5 -s ours am: b2e351b0 -s ours am: 0bc5e97c -s ours" into udc-dev-plus-aosp am: ac3b2466 -s ours am: 9cda84fc -s ours
  [automerger skipped] Merge "Ensure policy has no absurdly long strings" into sc-dev am: 34ac6bbd -s ours am: d8c3a883 -s ours am: ab871aa9 -s ours am: 9d5807a5 -s ours am: b2e351b0 -s ours am: 0bc5e97c -s ours am: 684cd57e -s ours am: 574f0f93 -s ours