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

Change-Id: I62d094ce16e65bf613e5e4b9405c87726e175c8f