[automerger skipped] Merge "cameraserver: Fix floating point truncation for...

[automerger skipped] Merge "cameraserver:  Fix floating point truncation for getUHRMaxJpegBufferSize" am: c1ea39b9 am: 0f6e84a0 am: 41f0c977 -s ours am: 738aa1a0 -s ours am: 74beb645 -s ours

am skip reason: Merged-In I6553ed5f4b617e70516cfaac3c248da3176912da with SHA-1 b2d84202 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2151867



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