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

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

Change-Id: I9e54ecffb45f0248d6aa83ed51d435419985588e