Merge changes from topic "am-5b0e0c62d1e54b2391a32d82c454958a" 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-d1-dev am: 25ea9692 -s ours am: 17a67878 -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: 38679935 -s ours am: 080ba4b6 -s ours