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

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



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