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: I3c58c437b8af871c8f13781688b83aedd190488e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>