Merge "Fix unstyled Notification RemoteViews inflation logic for apps targeting API 23 and lower." into sc-qpr1-dev am: 86536be5 am: 0a4f5a82

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

Change-Id: If69ff7dcbf8bf98d84aa3e0fcf13af1f56738817