Merge "Add fallback media layout for notification actions" into tm-dev am: 60c89a2f am: f4f12330

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

Change-Id: If974911565ee69ba0ba731876bb52a82b52093f1