[automerger skipped] Merge "Keep unforwarded operation for noted ops." into rvc-dev am: c784a29d am: 5a337a6a am: 6115a85d am: d8cd087b -s ours

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

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

Change-Id: Ifd60cf15c647dbfff15f47c204d572c37c440c48