[automerger skipped] Merge "Keep unforwarded operation for noted ops." into rvc-dev am: c784a29d am: 6eca51ab am: e8b16dea -s ours

am skip reason: Change-Id I3dcd8275b6229946875bc184d25b18d2da76d5ba with SHA-1 e44f134a is in history

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

Change-Id: I0652392f7f631a98c314121a145e6c37ab8cf933