Merge "Use "collapsible indent" for actions of any notification type." into...

Merge "Use "collapsible indent" for actions of any notification type." into sc-dev am: fd4d01d8 am: bc2889cb

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

Change-Id: I78cdf697e4475ceee6db81f815a9136c1f662c57