Merge "Ignore nonsensical clears from NoMan" into rvc-dev am: 191d081ba8 am: 0faeb265fc am: 672d934917

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

Change-Id: Ie0a28d0a5a1d168264697ca85b1adb8fd98ae218