Merge "Add StrictMode.noteSlowCall to calls that result in hw bitmap readback" into oc-dev
am: 01a5cc9004

Change-Id: I52ea2290a175df2dcd5b3805f7e5943e387133da