Merge "Add module cleanup command ot change navigation mode" into udc-dev am:...

Merge "Add module cleanup command ot change navigation mode" into udc-dev am: ab8218db am: d2f8aca3

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



Change-Id: I2688850cd8d54712f2c10ec1726df90918e918d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>