Merge "Fix NPE in InlineContentView" into rvc-dev am: 854b0d1a89

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

Change-Id: I243379817566a7ba433f4fdb5f6840fe6e4039b3