Merge "Use result-gmock.h." am: 4511b77d55 am: 520566ddef

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1728614

Change-Id: I5b214bf7486c0dbc418216ae400d809b61556d7c