Merge "Fix include in YuvToJpegEncoder" am: f35fce5bf4 am: b8b10b29eb am: f4b98d81af

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

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