Merge "Move statsd related hidden API flag file entries to packages/modules/Statsd"