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

Change-Id: I7f5471c6329e54669c2926779a26536a9dc6e51d