Merge "Skip useInvalidatedAuthBoundKey if no secure lock feature." am: ba283d1b4c am: 1983a67179 am: cb663d0c2e
am: 7472d85e5b

Change-Id: Ia8118f4c1769cfccffeb900f13300cfc527267fe