[automerger skipped] Merge "cameraserver: Remove framework only keys before...

[automerger skipped] Merge "cameraserver: Remove framework only keys before sending capture requests to hal." am: 853afb7d am: 77385c96 -s ours

am skip reason: Merged-In I418831008c39a14b940b909da81b508c2f9b0f0d with SHA-1 65c9bf0a is already in history

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

Change-Id: Ie62d4ad2ff3b38e02c2ef4888d37035eb0facabf