am d2a04e1e: Merge "Move typing policy to AOSP"

* commit 'd2a04e1e791de513c67ac9ded915fdbd074dda05':
  Move typing policy to AOSP