Merge "Track intent changes in frameworks/base" am: db9b2bfa95 am: 4c3b4106b6

Change-Id: Ibccc57bfed1884d44decf6bb06e28fd2dfa855af