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 am: ca0bd29a
Change-Id: I2771d649e378b853831c2ad2bae070ab57476c0c