Merge changes Ib0f927b5,I90a85ee9 into nyc-mr1-dev

* changes:
  Add a demo for InputConnectionCompat#commitContent
  Fix a type mismatch in COMMIT_CONTENT_FLAGS_KEY