Merge "Make sure apps cannot forge package name on AssistStructure used for Autofill." into oc-dev am: bd355dbf58 am: d62d68785e  -s ours
am: ed6f463636  -s ours

Change-Id: Iaf79d6fec857677e66af87927bc1aace01b9f1be