Merge "Ignore nonsensical clears from NoMan" into rvc-dev am: 191d081b am: d0f09fc3 am: 60185601

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

Change-Id: I0a3b08a2ff31b60d0f625741979accf4b04ff1b4