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

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

Change-Id: I93399adbac6298336ae2cd29b167ec03ae6f54c9