Merge "Code clean for libcameraservice" am: d851e320 am: 52c71c61 am: bf911335 am: eb3c5da8

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



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