Merge "Fix/suppress hwui/tests google-explicit-constructor warnings"
am: 6832595911

Change-Id: Iffb7f6fc3e829d8ebdb97d7e1a98e823a6ad5b44