[automerger skipped] Merge "Replace libmetricslogger logging with up-call to...
[automerger skipped] Merge "Replace libmetricslogger logging with up-call to Java for hidden api" am: 1da230b7 am: 9610b0be
am: e287eeee -s ours
am skip reason: change_id I3292f1d20cc8635391cddc3ba60d4a80b578fa82 with SHA1 d2f15375 is in history
Change-Id: Ib5d39a91a4b4aee0f3af7710b8b8fd71b943963e