Merge "Update the SHORT_SERVICE javadoc" into udc-dev am: 031692c5 am: 48930ee4

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



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