Merge "Keep unforwarded operation for noted ops." into rvc-dev am: c784a29dfd am: 5a337a6a9f

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

Change-Id: I21207135632bdfdb75713a7aed5adec91fdaa273