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

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

Change-Id: Ie966534c479ad854ff7e062360e72a5f622b726a