Merge "Fix NPE in InlineContentView" into rvc-dev am: 854b0d1a am: cc2d440d am: b11d142a am: 48099efd

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

Change-Id: I499c4523fea2dbaa02c668b8cfe2462d77d5f052