Merge "Add shmem through" into udc-dev am: ee429d93 am: 5c4b23f2

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



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