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 am: 3ecc08c5

Change-Id: Ie92f2959ecd2c79672ac4a736095053f06a64713