[automerger skipped] Merge "Track intent changes in frameworks/base" am: db9b2bfa95 am: 4c3b4106b6 am: ed6db8766f -s ours
am skip reason: Change-Id I038c3b9458795076abab7dc176c6cc91ffa0067f with SHA-1 0b10d7f543 is in history

Change-Id: I60505ef99783f36a38ab9e7b1261b2aeebea9866