Merge "Initialise hidden api usage logger pre-fork" am: 763747b7ce
am: c14670fc8e

Change-Id: I10aba0942a240ee041306c1bf24e6bed37e62f0a