Merge "Fix NPE in InlineContentView" into rvc-dev am: 854b0d1a am: a2b71f72 am: ae6f26dd am: 64e0c549

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

Change-Id: I48e87042b5c7b2523233cca8cc2ea92c8bf3e117