[automerger skipped] Merge "DO NOT MERGE Don't show notification private view...

[automerger skipped] Merge "DO NOT MERGE Don't show notification private view too early" into sc-v2-dev am: 0da4077e -s ours

am skip reason: Merged-In I5ce4460043250aad4a5b0b0838e6f3b5ae6feb1d with SHA-1 5e4dfaf4 is already in history

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

Change-Id: I87d1b9e02d01e2709a0df2d3e3a30a14d8a39f13