[automerger skipped] Merge "Restore libhidl_test Android.bp" am: 520ecd4ec1 am: ea0f519afc am: 6b89cccefc
am: 5a81d3f838 -s ours
am skip reason: change_id If089145adf12ee9d077bfe1616404080a5dc11b9 with SHA1 6123721c48 is in history

Change-Id: Id23649548802ec14bfc396f1e62491c729fd64e8