[automerger skipped] Merge "Rework the intent handling logic am: 4adf779f3a am: 15c856463e am: ee2013447e am: 4e6a25b2d0" into qt-qpr1-dev-plus-aosp
am: 25a2ddcac0 -s ours
am skip reason: change_id Id2ff95275049fc5067a880c401d10d0bf3700d61 with SHA1 c0990e870a is in history

Change-Id: I557bd5d9ee3a5d14c7c93caa098d1b6b61077f3c
tree: c1daa53ec3814e6597660d91632b9dfebec9bfcc
  1. res/
  2. src/
  3. tests/
  4. Android.bp
  5. AndroidManifest.xml
  6. PREUPLOAD.cfg