Merge "Merge "Guard against null info when applying widget RROs" into sc-dev am: 1561c6ac27 am: 9fd3a5cc5e am: 78a0558663" into sc-v2-dev-plus-aosp