Merge "Merge "Guard against null info when applying widget RROs" into sc-dev...

Merge "Merge "Guard against null info when applying widget RROs" into sc-dev am: 1561c6ac am: 9fd3a5cc am: 78a05586" into sc-v2-dev-plus-aosp am: be065e3b

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15543977

Change-Id: Ica25db19547a79b8dc530191400be9dbb70f65ed