Merge "Migrate to frameworks/proto_logging/stats" into stage-aosp-master