Merge "Sensor direct report test - gralloc support" am: b7841f02e2
am: 4ff424ce6c

Change-Id: If9a7d6b4f11d0ccefde26246747e40192db908bc