Merge "Merge "Call noteOperation() in ShellDelegate so that noteOp() really...
Merge "Merge "Call noteOperation() in ShellDelegate so that noteOp() really passes." into rvc-dev am: a87a494f am: ad34ccb6" into rvc-d1-dev-plus-aosp am: 0bfaa9a7
Change-Id: Ic756a9f8ef6062eeca41422c220b0dd7c70eeaa1