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

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

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