Merge "Guard against null info when applying widget RROs" into sc-dev am: 1561c6ac27

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

Change-Id: I3709c3153186b42cdc9923605b2d895183625a97