Merge "Fix include in YuvToJpegEncoder" am: f35fce5bf4

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

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