Merge "[2/n] Add AppCompat ProtoLog definition" into main