Merge "Camera: Switch to query function for display sync" into tm-dev am: de4930f6 am: 441ed53b

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



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