Merge "Merge "Filter the content of the Bundles used as extras and styling...

Merge "Merge "Filter the content of the Bundles used as extras and styling APIs" into rvc-dev am: 4ddfdaf6 am: b315a18f" into rvc-d1-dev-plus-aosp am: 12bbc848

Change-Id: Idf752193b0da50058a69e4805432c41f62219403