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

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

Change-Id: Ic9081c2bc3aef3b443690fbd5aef8ce0896227d8