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