[automerger skipped] Merge "Add test mapping for hdmi service code." into...
[automerger skipped] Merge "Add test mapping for hdmi service code." into rvc-dev am: 5ce9d34d am: 6c39f51c am: 1f616af9 am: d35ae893 -s ours
am skip reason: Change-Id I88ee832db299c6ced258c07c48b98f3d7affccd1 with SHA-1 dc6fbe5d is in history
Change-Id: I4be357143f534b87f61e8fc61dbbf5b28f23563c