Merge "TYPE_DYNAMIC_SENSOR_META should be wake up sensor" am: cec2ebf676 am: 8cddb920b5
am: 2146f7ef42

Change-Id: I0bf7252556efe2dcaa53e36d432c114776085a62