[automerger skipped] Merge "Add new capability polling opt-in intent" am:...
[automerger skipped] Merge "Add new capability polling opt-in intent" am: e5c083c3 am: d829dc0b -s ours
am skip reason: Change-Id I42b9d7226a1296bc7e4e86a5ff6448bc8f23d3c0 with SHA-1 0a5a8fe7 is in history
Change-Id: I1cbae0ddf81e4108b52b763a5dc3e942573f2720