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

Change-Id: Ia717039eb0bd201cbcecc0bab6da9824c475c4a9