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

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

Change-Id: Ifeb8aa9d37be3f26b1ee5ceb5f7727acddaf1dbe