Merge "Emulator: handle OOM and Protocol error cases" am: 940ca0c415 am: 21f2a87ae5 am: d81f7b9331

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

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