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

Change-Id: I85f853aee80cbe9659c646468d35fbd15a5a45d4