Merge "Merge "Add workaround for b/124210145" into qt-dev am: a8cf106193 am: a451bbe520" into qt-r1-dev-plus-aosp
am: 0c004d5e26

Change-Id: I36ed596bed0ccb76e2eb4b55196af53395c1accc