Merge "Fix include in YuvToJpegEncoder" am: f35fce5b am: b8b10b29 am: f4b98d81 am: 0f09c2be

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



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