[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: 26e0b508 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I877bc99221278dfb5ebac568572fcb87af83c0bf