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

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

Change-Id: I1be94b0d2a518231e979ef3a056865d12a2bd86d