Merge "Add new capability polling opt-in intent" into rvc-dev am: cd31f739da

Change-Id: I3d642af6ab5a59271c2cbb135e7c149a8eaa71da