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

Change-Id: Ia6f5c91605ebf5adf51cfbe3c0b8751e4f677147