[automerger skipped] Merge "Update equals and hashCode methods of NoMan.Policy" am: e3d6061a67 am: e9e1e8290a
am: 435f8cb618 -s ours
am skip reason: change_id I15835f784ba73b40eccf92a0a430905d28647669 with SHA1 4f8b0224e1 is in history

Change-Id: I720f63627fc603407e300738714f9e0ea52ae954