Merge changes from topic "aosp-oc-emulator-take2"

* changes:
  Fix signaling of uncalibrated magnetic sensor
  Enable keymaster3