Merge "Add change id for hidden api check hardening"
am: bdaed6e54d

Change-Id: I72a2f3a750ad6a198b5c75ebd9ceaaee4a23c1c6