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

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

Change-Id: Ia481b96aee110868d3f617ab27833fbb58a2e4ba