Merge "Fix/suppress bootanimation google-explicit-constructor warnings"
am: 50ee220126

Change-Id: Ic66073e57baef324a7b0bfe968b132418f95dcc7