Merge "Add proto constants for hidden API logging." into pi-dev am: 8182e354d8
am: 38f4a1902d

Change-Id: I24ecfefa361ef441cd4f907699c3c7f1ef0bd226