Merge "Fix a potential NPE" into sc-v2-dev am: 4b3ea38f9b am: 6f120287c9

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

Change-Id: I27362b4a9b9698f2e1d4ba87ce941050b3e43dd9