Merge "[automerger skipped] Merge "Convert tests/tests/hardware/**/Android.mk files to Android.bp (cherrypick)" am: 9bcec21a28 am: 5c831651f8 -s ours am skip reason: change_id Ia6f9e9197934ca4af5b87a3c5907801190b95ce0 with SHA1 cf29142393 is in history" into qt-dev-plus-aosp