Merge "Keep Screen saver when unplugging the usb from device" into udc-dev am: 5f98786d

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



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