Merge "Camera: Look up client name for NDK earlier" into tm-qpr-dev am: 2170f74c

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



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