Merge tag 'android-10.0.0_r33' of https://android.googlesource.com/platform//hardware/libhardware into q

Android 10.0.0 Release 33 (QQ2A.200405.005)

Change-Id: Ida424ed7c52e24e8b547a4841e07586ddfdb691c