Merge "Update context sync adb commands" into udc-dev am: 1e1ead7e am: 6cc9854c

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



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