Merge "Merge "Use java.util.Objects.hashCode to get hashcode." am: 3890689bb2" into stage-aosp-master am: fa67fe7a4e am: d7e9bbedc8
am: d775de3ff0

Change-Id: I7c2405956abbf02da998f7b788dfb81a3a1fbaa5