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

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



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