Merge "Address API review feedback for AmbientContext. Add shell method for...

Merge "Address API review feedback for AmbientContext. Add shell method for more test coverage. Do not unregister request from the same client and delegate to AiAi to handle it." into tm-dev am: 4bb44e08

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

Change-Id: Idce474fb31140cad5cb7cfe843b12bd75a466bcf