Merge "Merge "Revert "Revert "Call noteOperation() in ShellDelegate so that...
Merge "Merge "Revert "Revert "Call noteOperation() in ShellDelegate so that noteOp() really passes.""" into rvc-dev am: 664ef145 am: e10088fb" into rvc-d1-dev-plus-aosp am: bce8c7c0
Change-Id: I9358fe5e52636a7391f857126c6625cd5761ee1f