Merge "Ignore nonsensical clears from NoMan" into rvc-dev am: 191d081ba8 am: d0f09fc39f

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

Change-Id: I3d9e7fcf606190341d4d9d96ed522f890841050c