Merge "Ignore nonsensical clears from NoMan" into rvc-dev am: 191d081b am: 0faeb265

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

Change-Id: Ibc73f5b9214796f9e8f8897fd7ef71cc3be91181