Merge "Camera: Handling out-of-order request id" into udc-qpr-dev am: 41fd079b am: 47807eba

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



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