Merge "Remove notification cap on lockscreen" into sc-v2-dev am: 26244a83

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

Change-Id: I7539332261e18345aa937e21b1269a6d75b6d08b